Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 29 Aug 2010 22:46:58 +0000 (22:46 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 29 Aug 2010 22:46:58 +0000 (22:46 +0000)

Trivial merge